fixed missing $X_CFLAGS setup in case x11.pc is present.

Mon Nov  7 16:15:16 2005  Tim Janik  <timj@imendio.com>

        * configure.in: fixed missing $X_CFLAGS setup in case x11.pc is present.

diff --git a/ChangeLog b/ChangeLog
index c0bc115e1327d13d45b560a54f6bd102b176888f..564489ec84d203ed58f4b781e18174e66bc1531b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Nov  7 16:15:16 2005  Tim Janik  <timj@imendio.com>
+
+       * configure.in: fixed missing $X_CFLAGS setup in case x11.pc is present.
+
 2005-11-07  Matthias Clasen  <mclasen@redhat.com>
 
        * configure.in: Adjust to the stock icon changes.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index c0bc115e1327d13d45b560a54f6bd102b176888f..564489ec84d203ed58f4b781e18174e66bc1531b 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+Mon Nov  7 16:15:16 2005  Tim Janik  <timj@imendio.com>
+
+       * configure.in: fixed missing $X_CFLAGS setup in case x11.pc is present.
+
 2005-11-07  Matthias Clasen  <mclasen@redhat.com>
 
        * configure.in: Adjust to the stock icon changes.

diff --git a/configure.in b/configure.in
index f21ca91c1cf5e51795c225b03322a75a4a3eda11..069bf6306704db61bfc8684aa1ef538b4746faed 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1049,6 +1049,7 @@ if test "x$gdktarget" = "xx11"; then
     have_base_x_pc=true
     X_PACKAGES="$X_PACKAGES x11 xext"
     x_libs="`pkg-config --libs x11 xext`"
+    X_CFLAGS="`pkg-config --cflags x11 xext`"
     
     # Strip out any .la files that pkg-config might give us (this happens
     # with -uninstalled.pc files)